merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 19 Oct 2010 05:52:37 +0000 (14:52 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 19 Oct 2010 05:52:37 +0000 (14:52 +0900)

Trivial merge